From: Stuart Prescott Date: Sun, 19 Jul 2026 02:52:24 +0000 (+1000) Subject: Combine all test blacklist patches X-Git-Tag: archive/raspbian/6.11.2-2+rpi1^2~19 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=38f402df5676588731f12933b9657373b136a173;p=pyside6.git Combine all test blacklist patches --- diff --git a/debian/patches/0003-Add-failing-tests-to-blacklist.patch b/debian/patches/0003-Add-failing-tests-to-blacklist.patch deleted file mode 100644 index b5d06c81..00000000 --- a/debian/patches/0003-Add-failing-tests-to-blacklist.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Stuart Prescott -Date: Fri, 3 May 2024 16:50:13 +1000 -Subject: Add failing tests to blacklist - -Tests are still run but will fail. They are run multiple times to see if -they still fail - it would be better to just skip them. - -It is not yet clear whether these failures are important. ---- - build_history/blacklist.txt | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index b2aaecb..f7e415d 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -81,3 +81,19 @@ - [QtQml::qqmlincubator_incubateWhile] - pypy # gives timeout on macOS if I run video converter while testing - # 2022-03-04 PyPy: Currently 28 of 657 tests fail -+ -+# Debian packaging failing tests -+[sample::array_numpy] -+ py3 -+[sample::nontypetemplate] -+ py3 -+[pyside6-android-deploy::test_pyside6_android_deploy] -+ py3 -+[QtCore::qinstallmsghandler_test] -+ py3 -+[QtCore::loggingcategorymacros_test] -+ py3 -+[QtGui::qpainter_test] -+ py3 -+[QtCharts::qcharts_numpy_test] -+ py3 diff --git a/debian/patches/0003-Fix-numpy-header-detection.patch b/debian/patches/0003-Fix-numpy-header-detection.patch new file mode 100644 index 00000000..bb90270e --- /dev/null +++ b/debian/patches/0003-Fix-numpy-header-detection.patch @@ -0,0 +1,34 @@ +From: Stuart Prescott +Date: Sun, 16 Feb 2025 01:27:09 +1100 +Subject: Fix numpy header detection + +Existing code makes assumptions about site-packages/dist-packages +and fails to find the headers; numpy has an explicit function for this +--- + build_scripts/utils.py | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/build_scripts/utils.py b/build_scripts/utils.py +index 3cb7ade..c37d087 100644 +--- a/build_scripts/utils.py ++++ b/build_scripts/utils.py +@@ -77,17 +77,8 @@ def update_env_path(newpaths): + + + def get_numpy_location(): +- for p in sys.path: +- if 'site-' in p: +- numpy = Path(p).resolve() / 'numpy' +- if numpy.is_dir(): +- candidate = numpy / '_core' / 'include' # Version 2 +- if not candidate.is_dir(): +- candidate = numpy / 'core' / 'include' # Version 1 +- if candidate.is_dir(): +- return os.fspath(candidate) +- log.warning(f"Cannot find numpy include dir under {numpy}") +- return None ++ import numpy ++ return numpy.get_include() + + + def platform_cmake_options(as_tuple_list=False): diff --git a/debian/patches/0004-Fix-numpy-header-detection.patch b/debian/patches/0004-Fix-numpy-header-detection.patch deleted file mode 100644 index bb90270e..00000000 --- a/debian/patches/0004-Fix-numpy-header-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Stuart Prescott -Date: Sun, 16 Feb 2025 01:27:09 +1100 -Subject: Fix numpy header detection - -Existing code makes assumptions about site-packages/dist-packages -and fails to find the headers; numpy has an explicit function for this ---- - build_scripts/utils.py | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) - -diff --git a/build_scripts/utils.py b/build_scripts/utils.py -index 3cb7ade..c37d087 100644 ---- a/build_scripts/utils.py -+++ b/build_scripts/utils.py -@@ -77,17 +77,8 @@ def update_env_path(newpaths): - - - def get_numpy_location(): -- for p in sys.path: -- if 'site-' in p: -- numpy = Path(p).resolve() / 'numpy' -- if numpy.is_dir(): -- candidate = numpy / '_core' / 'include' # Version 2 -- if not candidate.is_dir(): -- candidate = numpy / 'core' / 'include' # Version 1 -- if candidate.is_dir(): -- return os.fspath(candidate) -- log.warning(f"Cannot find numpy include dir under {numpy}") -- return None -+ import numpy -+ return numpy.get_include() - - - def platform_cmake_options(as_tuple_list=False): diff --git a/debian/patches/0004-Fix-python-module-paths-in-CMake.patch b/debian/patches/0004-Fix-python-module-paths-in-CMake.patch new file mode 100644 index 00000000..f718b27e --- /dev/null +++ b/debian/patches/0004-Fix-python-module-paths-in-CMake.patch @@ -0,0 +1,28 @@ +From: Stuart Prescott +Date: Tue, 18 Feb 2025 00:50:57 +1100 +Subject: Fix python module paths in CMake + +--- + sources/shiboken6/cmake/ShibokenHelpers.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake +index 0e993fa..63044c3 100644 +--- a/sources/shiboken6/cmake/ShibokenHelpers.cmake ++++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake +@@ -143,13 +143,13 @@ macro(shiboken_internal_set_python_site_packages) + if sys.platform == 'win32': + lib_path = sysconfig.get_path('purelib') + else: +- lib_path = sysconfig.get_path('purelib', scheme='posix_prefix') ++ lib_path = sysconfig.get_path('purelib', scheme='deb_system') + + # /home/qt/dev/env + if sys.platform == 'win32': + data_path = sysconfig.get_path('data') + else: +- data_path = sysconfig.get_path('data', scheme='posix_prefix') ++ data_path = sysconfig.get_path('data', scheme='deb_system') + + # /lib/python3.9/site-packages + rel_path = lib_path.replace(data_path, '') diff --git a/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch b/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch deleted file mode 100644 index 07894606..00000000 --- a/debian/patches/0005-Mark-arm64-test-failures-as-xfail-temporarily.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Stuart Prescott -Date: Tue, 10 Sep 2024 06:34:52 +1000 -Subject: Mark arm64 test failures as xfail temporarily - -Try to at least get a package built to be able to debug the failure ---- - build_history/blacklist.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index f7e415d..8cdefe9 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -97,3 +97,11 @@ - py3 - [QtCharts::qcharts_numpy_test] - py3 -+ -+# Debian arm64-specific failures - temporarily xfail them -+[QtWidgets::bug_668] -+ py3 -+[QtWidgets::bug_728] -+ py3 -+[pysidetest::new_inherited_functions_test] -+ py3 diff --git a/debian/patches/0005-Remove-dependency-from-shiboken6_generator.patch b/debian/patches/0005-Remove-dependency-from-shiboken6_generator.patch new file mode 100644 index 00000000..5e0f8d5a --- /dev/null +++ b/debian/patches/0005-Remove-dependency-from-shiboken6_generator.patch @@ -0,0 +1,22 @@ +From: Stuart Prescott +Date: Wed, 19 Feb 2025 00:32:42 +1100 +Subject: Remove dependency from shiboken6_generator + +Breaks dh_python3 dependency calculation +--- + create_wheels.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/create_wheels.py b/create_wheels.py +index 6f8d881..d68b4cd 100644 +--- a/create_wheels.py ++++ b/create_wheels.py +@@ -186,7 +186,7 @@ def generate_pyproject_toml(artifacts: Path, setup: SetupData) -> str: + _dependencies.append(f"shiboken6=={setup.version[0]}") + _dependencies.append(f"PySide6_Essentials=={setup.version[0]}") + elif _name == "shiboken6_generator": +- _dependencies.append(f"shiboken6=={setup.version[0]}") ++ pass + + with open(artifacts / "pyproject.toml.base") as f: + content = ( diff --git a/debian/patches/0006-Use-correct-Python-module-paths-in-cmake-files.patch b/debian/patches/0006-Use-correct-Python-module-paths-in-cmake-files.patch new file mode 100644 index 00000000..6d11bbb9 --- /dev/null +++ b/debian/patches/0006-Use-correct-Python-module-paths-in-cmake-files.patch @@ -0,0 +1,31 @@ +From: Stuart Prescott +Date: Sat, 28 Mar 2026 17:10:38 +1100 +Subject: Use correct Python module paths in cmake files + +--- + sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in +index fdc8e6d..afb8903 100644 +--- a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in ++++ b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in +@@ -7,16 +7,9 @@ if(NOT CMAKE_CROSSCOMPILING) + find_dependency(Python COMPONENTS Interpreter Development.Module) + + if(NOT SHIBOKEN6TOOLS_SKIP_FIND_DEPENDENCIES) +- # Dynamically determine Python_SITELIB using Python itself +- execute_process( +- COMMAND ${Python_EXECUTABLE} -c +- "import site; print(next(p for p in site.getsitepackages() if 'site-packages' in p))" +- OUTPUT_VARIABLE Python_SITELIB +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) + list(APPEND CMAKE_PREFIX_PATH +- "${Python_SITELIB}/shiboken6/lib/cmake" +- "${Python_SITELIB}/PySide6/lib/cmake" ++ "/usr/lib/python3/dist-packages/shiboken6/lib/cmake" ++ "/usr/lib/python3/dist-packages/PySide6/lib/cmake" + ) + find_dependency(Shiboken6 REQUIRED) + find_dependency(PySide6 REQUIRED) diff --git a/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch b/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch deleted file mode 100644 index 4949f034..00000000 --- a/debian/patches/0006-XFAIL-a-new-test-failure-with-6.7.2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stuart Prescott -Date: Sun, 6 Oct 2024 19:46:11 +1100 -Subject: XFAIL a new test failure with 6.7.2 - -Tests are substantially changed in new release; library not -being found in multi-arch paths ---- - build_history/blacklist.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index 8cdefe9..d977d44 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -89,6 +89,8 @@ - py3 - [pyside6-android-deploy::test_pyside6_android_deploy] - py3 -+[pyside6-deploy::test_pyside6_deploy] -+ py3 - [QtCore::qinstallmsghandler_test] - py3 - [QtCore::loggingcategorymacros_test] diff --git a/debian/patches/0007-Add-failing-tests-to-blacklist.patch b/debian/patches/0007-Add-failing-tests-to-blacklist.patch new file mode 100644 index 00000000..e2039d94 --- /dev/null +++ b/debian/patches/0007-Add-failing-tests-to-blacklist.patch @@ -0,0 +1,47 @@ +From: Stuart Prescott +Date: Fri, 3 May 2024 16:50:13 +1000 +Subject: Add failing tests to blacklist + +Tests are still run but will fail. They are still run multiple times to +cope with some tests being flaky. + +See the script debian/check-build-logs to see if tests now pass on all +architectures to be able to remove them from this list. +--- + build_history/blacklist.txt | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt +index b2aaecb..dda7c24 100644 +--- a/build_history/blacklist.txt ++++ b/build_history/blacklist.txt +@@ -81,3 +81,29 @@ + [QtQml::qqmlincubator_incubateWhile] + pypy # gives timeout on macOS if I run video converter while testing + # 2022-03-04 PyPy: Currently 28 of 657 tests fail ++ ++# Debian packaging failing tests ++[pyside6-android-deploy::test_pyside6_android_deploy] ++ py3 ++[pyside6-deploy::test_pyside6_deploy] ++ py3 ++[QtCore::qinstallmsghandler_test] ++ py3 ++[QtCore::loggingcategorymacros_test] ++ py3 ++[QtGui::qpainter_test] ++ py3 ++[QtCharts::qcharts_numpy_test] ++ py3 ++ ++# Debian arm64-specific failures - temporarily xfail them ++[QtWidgets::bug_668] ++ py3 ++[QtWidgets::bug_728] ++ py3 ++[pysidetest::new_inherited_functions_test] ++ py3 ++ ++# Debian mips64el-specific failures - temporarily xfail them ++[QtQml::qquickitem_grabToImage] ++ py3 diff --git a/debian/patches/0007-XFAIL-smart-smart_pointer.patch b/debian/patches/0007-XFAIL-smart-smart_pointer.patch deleted file mode 100644 index 08371a65..00000000 --- a/debian/patches/0007-XFAIL-smart-smart_pointer.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Stuart Prescott -Date: Mon, 14 Oct 2024 12:39:53 +1100 -Subject: XFAIL smart::smart_pointer - -Failure seen on armel ---- - build_history/blacklist.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index d977d44..27063f9 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -1,5 +1,6 @@ - [smart::smart_pointer] - darwin ci -+ py3 - [testmodifydocumentation] - darwin arm - [signals::signal_signature_test] diff --git a/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch b/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch deleted file mode 100644 index 723b5428..00000000 --- a/debian/patches/0008-XFAIL-QtQml-qquickitem_grabToImage.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stuart Prescott -Date: Mon, 14 Oct 2024 12:45:22 +1100 -Subject: XFAIL QtQml::qquickitem_grabToImage - -Failure seen on mips64el ---- - build_history/blacklist.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt -index 27063f9..065793d 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -108,3 +108,7 @@ - py3 - [pysidetest::new_inherited_functions_test] - py3 -+ -+# Debian mips64el-specific failures - temporarily xfail them -+[QtQml::qquickitem_grabToImage] -+ py3 diff --git a/debian/patches/0009-Fix-python-module-paths-in-CMake.patch b/debian/patches/0009-Fix-python-module-paths-in-CMake.patch deleted file mode 100644 index f718b27e..00000000 --- a/debian/patches/0009-Fix-python-module-paths-in-CMake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Stuart Prescott -Date: Tue, 18 Feb 2025 00:50:57 +1100 -Subject: Fix python module paths in CMake - ---- - sources/shiboken6/cmake/ShibokenHelpers.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake -index 0e993fa..63044c3 100644 ---- a/sources/shiboken6/cmake/ShibokenHelpers.cmake -+++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake -@@ -143,13 +143,13 @@ macro(shiboken_internal_set_python_site_packages) - if sys.platform == 'win32': - lib_path = sysconfig.get_path('purelib') - else: -- lib_path = sysconfig.get_path('purelib', scheme='posix_prefix') -+ lib_path = sysconfig.get_path('purelib', scheme='deb_system') - - # /home/qt/dev/env - if sys.platform == 'win32': - data_path = sysconfig.get_path('data') - else: -- data_path = sysconfig.get_path('data', scheme='posix_prefix') -+ data_path = sysconfig.get_path('data', scheme='deb_system') - - # /lib/python3.9/site-packages - rel_path = lib_path.replace(data_path, '') diff --git a/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch b/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch deleted file mode 100644 index 5e0f8d5a..00000000 --- a/debian/patches/0010-Remove-dependency-from-shiboken6_generator.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Stuart Prescott -Date: Wed, 19 Feb 2025 00:32:42 +1100 -Subject: Remove dependency from shiboken6_generator - -Breaks dh_python3 dependency calculation ---- - create_wheels.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/create_wheels.py b/create_wheels.py -index 6f8d881..d68b4cd 100644 ---- a/create_wheels.py -+++ b/create_wheels.py -@@ -186,7 +186,7 @@ def generate_pyproject_toml(artifacts: Path, setup: SetupData) -> str: - _dependencies.append(f"shiboken6=={setup.version[0]}") - _dependencies.append(f"PySide6_Essentials=={setup.version[0]}") - elif _name == "shiboken6_generator": -- _dependencies.append(f"shiboken6=={setup.version[0]}") -+ pass - - with open(artifacts / "pyproject.toml.base") as f: - content = ( diff --git a/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch b/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch deleted file mode 100644 index 6d11bbb9..00000000 --- a/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Stuart Prescott -Date: Sat, 28 Mar 2026 17:10:38 +1100 -Subject: Use correct Python module paths in cmake files - ---- - sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in -index fdc8e6d..afb8903 100644 ---- a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in -+++ b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in -@@ -7,16 +7,9 @@ if(NOT CMAKE_CROSSCOMPILING) - find_dependency(Python COMPONENTS Interpreter Development.Module) - - if(NOT SHIBOKEN6TOOLS_SKIP_FIND_DEPENDENCIES) -- # Dynamically determine Python_SITELIB using Python itself -- execute_process( -- COMMAND ${Python_EXECUTABLE} -c -- "import site; print(next(p for p in site.getsitepackages() if 'site-packages' in p))" -- OUTPUT_VARIABLE Python_SITELIB -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) - list(APPEND CMAKE_PREFIX_PATH -- "${Python_SITELIB}/shiboken6/lib/cmake" -- "${Python_SITELIB}/PySide6/lib/cmake" -+ "/usr/lib/python3/dist-packages/shiboken6/lib/cmake" -+ "/usr/lib/python3/dist-packages/PySide6/lib/cmake" - ) - find_dependency(Shiboken6 REQUIRED) - find_dependency(PySide6 REQUIRED) diff --git a/debian/patches/series b/debian/patches/series index f84c27d2..33b9be18 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,7 @@ 0001-Find-the-build-directory-matching-the-current-interp.patch 0002-Fix-missing-subparser-in-test-harness.patch -0003-Add-failing-tests-to-blacklist.patch -0004-Fix-numpy-header-detection.patch -0005-Mark-arm64-test-failures-as-xfail-temporarily.patch -0006-XFAIL-a-new-test-failure-with-6.7.2.patch -0007-XFAIL-smart-smart_pointer.patch -0008-XFAIL-QtQml-qquickitem_grabToImage.patch -0009-Fix-python-module-paths-in-CMake.patch -0010-Remove-dependency-from-shiboken6_generator.patch -0011-Use-correct-Python-module-paths-in-cmake-files.patch +0003-Fix-numpy-header-detection.patch +0004-Fix-python-module-paths-in-CMake.patch +0005-Remove-dependency-from-shiboken6_generator.patch +0006-Use-correct-Python-module-paths-in-cmake-files.patch +0007-Add-failing-tests-to-blacklist.patch